Add OTP support (api keys coming soon)