Use CM dependencies for now