CMS-2557 Add Key property to descriptors