Redesign user file upload model so it wroks for both upload and dowload