Replace resource manager calls with catalog service calls + small improvements