Updated for non-HealthKit devices