Barcode + Entity changes