Updating Enumerate method in line with Barcode