Skills refactored