Further Batch Refactor