Incorporate avalon-batch refactoring