Added new CM related stuff
New features