Skills refactor