Save servers as well