Skills refactoring to directive