diff --git a/RCTAppleHealthKit/RCTAppleHealthKit+Queries.m b/RCTAppleHealthKit/RCTAppleHealthKit+Queries.m
index d296a67b54efb0ddf48b13e13f8c50e344f5a6a7..4200a06af0eb5e4bd129dc09f9646e8c8c149381 100644
--- a/RCTAppleHealthKit/RCTAppleHealthKit+Queries.m
+++ b/RCTAppleHealthKit/RCTAppleHealthKit+Queries.m
@@ -133,24 +133,23 @@
             dispatch_async(dispatch_get_main_queue(), ^{
                 if (type == [HKObjectType workoutType]) {
                     for (HKWorkout *sample in results) {
-                        HKQuantity *quantity = sample.quantity;
-                        double value = [quantity doubleValueForUnit:unit];
+                        double energy =  [[sample totalEnergyBurned] doubleValueForUnit:[HKUnit kilocalorieUnit]];
+                        double distance = [[sample totalDistance] doubleValueForUnit:[HKUnit mileUnit]];
+                        NSString *type = [RCTAppleHealthKit stringForHKWorkoutActivityType:[sample workoutActivityType]];
                         
                         NSString *startDateString = [RCTAppleHealthKit buildISO8601StringFromDate:sample.startDate];
                         NSString *endDateString = [RCTAppleHealthKit buildISO8601StringFromDate:sample.endDate];
                         
                         NSDictionary *elem = @{
-                                               @"value" : @(value),
+                                               @"type" : type,
+                                               @"energy" : @(energy),
+                                               @"distance" : @(distance),
                                                @"startDate" : startDateString,
                                                @"endDate" : endDateString,
                                                paramName : @(param),
                                                };
                         
                         [data addObject:elem];
-                        
-                        NSLog(@"%lu", (unsigned long)[sample workoutActivityType]);
-                        NSLog(@"energy burned %f", [[sample totalEnergyBurned] doubleValueForUnit:[HKUnit kilocalorieUnit]]);
-                        NSLog(@"total distance %f", [[sample totalDistance] doubleValueForUnit:[HKUnit mileUnit]]);
                     }
                 } else {
                     for (HKQuantitySample *sample in results) {
diff --git a/RCTAppleHealthKit/RCTAppleHealthKit+Utils.h b/RCTAppleHealthKit/RCTAppleHealthKit+Utils.h
index f5d33f380636b123fd370874e61fcbebb104c9e6..a78acc54a4d0714be8f774a6a2f2571da59fc574 100644
--- a/RCTAppleHealthKit/RCTAppleHealthKit+Utils.h
+++ b/RCTAppleHealthKit/RCTAppleHealthKit+Utils.h
@@ -32,5 +32,6 @@
 + (bool)boolFromOptions:(NSDictionary *)options key:(NSString *)key withDefault:(bool)defaultValue;
 
 + (NSMutableArray *)reverseNSMutableArray:(NSMutableArray *)array;
++ (NSString*) stringForHKWorkoutActivityType:(int) enumValue;
 
 @end
diff --git a/RCTAppleHealthKit/RCTAppleHealthKit+Utils.m b/RCTAppleHealthKit/RCTAppleHealthKit+Utils.m
index 9ffb0967d3a067a481f2f6bd2611caea4948991e..1c54e6d25f73765a5fd3fd02a249c6b85bdbb01d 100644
--- a/RCTAppleHealthKit/RCTAppleHealthKit+Utils.m
+++ b/RCTAppleHealthKit/RCTAppleHealthKit+Utils.m
@@ -320,4 +320,132 @@
     return array;
 }
 
++ (NSString*)stringForHKWorkoutActivityType:(int) enumValue{
+    switch( enumValue ){
+        case HKWorkoutActivityTypeAmericanFootball:
+            return @"AmericanFootball";
+        case HKWorkoutActivityTypeArchery:
+            return @"Archery";
+        case HKWorkoutActivityTypeAustralianFootball:
+            return @"AustralianFootball";
+        case HKWorkoutActivityTypeBadminton:
+            return @"Badminton";
+        case HKWorkoutActivityTypeBaseball:
+            return @"Baseball";
+        case HKWorkoutActivityTypeBasketball:
+            return @"Basketball";
+        case HKWorkoutActivityTypeBowling:
+            return @"Bowling";
+        case HKWorkoutActivityTypeBoxing:
+            return @"Boxing";
+        case HKWorkoutActivityTypeClimbing:
+            return @"Climbing";
+        case HKWorkoutActivityTypeCricket:
+            return @"Cricket";
+        case HKWorkoutActivityTypeCrossTraining:
+            return @"CrossTraining";
+        case HKWorkoutActivityTypeCurling:
+            return @"Curling";
+        case HKWorkoutActivityTypeCycling:
+            return @"Cycling";
+        case HKWorkoutActivityTypeDance:
+            return @"Dance";
+        case HKWorkoutActivityTypeDanceInspiredTraining:
+            return @"DanceInspiredTraining";
+        case HKWorkoutActivityTypeElliptical:
+            return @"Elliptical";
+        case HKWorkoutActivityTypeEquestrianSports:
+            return @"EquestrianSports";
+        case HKWorkoutActivityTypeFencing:
+            return @"Fencing";
+        case HKWorkoutActivityTypeFishing:
+            return @"Fishing";
+        case HKWorkoutActivityTypeFunctionalStrengthTraining:
+            return @"FunctionalStrengthTraining";
+        case HKWorkoutActivityTypeGolf:
+            return @"Golf";
+        case HKWorkoutActivityTypeGymnastics:
+            return @"Gymnastics";
+        case HKWorkoutActivityTypeHandball:
+            return @"Handball";
+        case HKWorkoutActivityTypeHiking:
+            return @"Hiking";
+        case HKWorkoutActivityTypeHockey:
+            return @"Hockey";
+        case HKWorkoutActivityTypeHunting:
+            return @"Hunting";
+        case HKWorkoutActivityTypeLacrosse:
+            return @"Lacrosse";
+        case HKWorkoutActivityTypeMartialArts:
+            return @"MartialArts";
+        case HKWorkoutActivityTypeMindAndBody:
+            return @"MindAndBody";
+        case HKWorkoutActivityTypeMixedMetabolicCardioTraining:
+            return @"MixedMetabolicCardioTraining";
+        case HKWorkoutActivityTypePaddleSports:
+            return @"PaddleSports";
+        case HKWorkoutActivityTypePlay:
+            return @"Play";
+        case HKWorkoutActivityTypePreparationAndRecovery:
+            return @"PreparationAndRecovery";
+        case HKWorkoutActivityTypeRacquetball:
+            return @"Racquetball";
+        case HKWorkoutActivityTypeRowing:
+            return @"Rowing";
+        case HKWorkoutActivityTypeRugby:
+            return @"Rugby";
+        case HKWorkoutActivityTypeRunning:
+            return @"Running";
+        case HKWorkoutActivityTypeSailing:
+            return @"Sailing";
+        case HKWorkoutActivityTypeSkatingSports:
+            return @"SkatingSports";
+        case HKWorkoutActivityTypeSnowSports:
+            return @"SnowSports";
+        case HKWorkoutActivityTypeSoccer:
+            return @"Soccer";
+        case HKWorkoutActivityTypeSoftball:
+            return @"Softball";
+        case HKWorkoutActivityTypeSquash:
+            return @"Squash";
+        case HKWorkoutActivityTypeStairClimbing:
+            return @"StairClimbing";
+        case HKWorkoutActivityTypeSurfingSports:
+            return @"SurfingSports";
+        case HKWorkoutActivityTypeSwimming:
+            return @"Swimming";
+        case HKWorkoutActivityTypeTableTennis:
+            return @"TableTennis";
+        case HKWorkoutActivityTypeTennis:
+            return @"Tennis";
+        case HKWorkoutActivityTypeTrackAndField:
+            return @"TrackAndField";
+        case HKWorkoutActivityTypeTraditionalStrengthTraining:
+            return @"TraditionalStrengthTraining";
+        case HKWorkoutActivityTypeVolleyball:
+            return @"Volleyball";
+        case HKWorkoutActivityTypeWalking:
+            return @"Walking";
+        case HKWorkoutActivityTypeWaterFitness:
+            return @"WaterFitness";
+        case HKWorkoutActivityTypeWaterPolo:
+            return @"WaterPolo";
+        case HKWorkoutActivityTypeWaterSports:
+            return @"WaterSports";
+        case HKWorkoutActivityTypeWrestling:
+            return @"Wrestling";
+        case HKWorkoutActivityTypeYoga:
+            return @"Yoga";
+        case HKWorkoutActivityTypeOther:
+            return @"Other";
+        default:{
+            NSException *e = [NSException
+                              exceptionWithName:@"HKWorkoutActivityType InvalidValue"
+                              reason:@"HKWorkoutActivityType can only have a value from the HKWorkoutActivityType enum"
+                              userInfo:nil];
+            @throw e;
+        }
+    }
+}
+
 @end