Added timeouts to web calls and persisted uploadmanager