Service code refactored