Service refacto