Updated manifest to use more CM