More updates to domain model and batches