Refactored upload / connect to reflect backend changes