Add better support for CGM operations.