Updated Reorder and EmailConfirmation Classes