Cleaned up GSM interface to match overall interfaces