Add an option for gateway timeserver handling