Add batch handler