Added yamlccp05/03 support