added support for OIM/OAM