First set of CM-900 related changes