Added an auto-track option to the Gateways