Descriptor management improved