Update cdm plugin to work with versioning: APY-16