Adapted for the latest CDA infrastructure update (target 5.0)