Updated code base for CGM