Added filter support for gateways