Added initial support for the batch endpoint