Pull out batch counter
Persist updated values and refactor typedcollection checks
omg batch map