Descriptor Classes modified