Added support for strength, cardio and measurement