Refactored category specifik components to work for exercise