Add support for batch manager