Add explicit CM dependencies