Clean up AIM Gateway from CIM calls
Add CIM Gateways with varios type of requests