Feature/add batch ops