Resolve services (30/38)

Resolve services