Updated to support new OAPoC version.