Descriptor classes refined