Improve checks for existing tokens