Added support for format 2 in OTP