Make necessary changes after the addition of support for multiple OTPs