More work on batch engine implementation