Initial pass for supporting OTM2