Added upstream server support