Moved identity services in its own class