Updated to account for new CommonCapabilityPropertiesVocab