Added several entities and a BatchControlFactory