Service refactor