Update to use JWTs