Refactoring of CreateDescriptor commands.