Adding Fitness and Routine support