Convert to new Fitness API calls