Refactoring the descriptors