Added some tracking states to Batch