Moved services to DI