Refactor registration of descriptors