restored case class for actor + code clean up to avoid long internal name for the batch field