Added handling of payload/args/kwargs when resubmitting tasks