Take into account new EPC data format