Refactoring descriptor validation