Added server side token validation