Custom Service annotations refactoring