Add support for JWT
Add User support