Descriptor classes moved into state classes