Move to one Task per event to be processed