Better OTP integration