Improved registering gateways and types