Services layer refactoring