Role services refactored