Added barcode support