Refactored some services