Refactor due to change in Batcher's api