Add compatibility for opf2.0