Add get all services call
Cleanup