Added TokenValidation