Mms: Refactor CM Additions resources

Change-Id: If4798a9ad50dbc729fb83a23309a6103d3a98e16