Added server tracking and improved checking