Updated Redirect generation and added upload