Improve upload