Added gateways component