Added Descriptor classes.