Feature/better batch