Handle uploads better