Service refactored