Updated client to work with latest OTP API