Added unmanaged server tracking