Moved towards using gsm.mk