Updated support for ModemSetup