Added support for CM 11