Improve Token validation