Added entities and batches