Added the ability to work with other servers