Reworked datavalues and entityid to avoid magic constants
Prepared quantity datavalue
Implemented parsing of qualifiers