Feature/6 batched handler