Add currentServer #9