Service refactor complete