Improve access to composite and GS1 data modes