Refactored skills controller.