Support the latest gateway