Added support for gsm modem and other small changes