Add dependencies and remove cm's