Revise upload components for improved Cloud Storage compatibility