#3 Extend DescriptorDAO to add type specific labels