Changed Structure of Descriptors

More complex descriptors were added