Proper upload and tracking