Add custom repository for Descriptors
Some refactoring