Added support for resend