[WIP] Add quantity data value handler