Add support for gateway options call