Resolve services (37/38)

Resolve services