Added option to pass OTP length