Initial changes for CM