In eip_service_2 definition, move gateways from array to hash