Add valid? to Token