Refactoring of DescriptorHelper