Work on APY-16 Implement version support in CDM