Support new version of OM
Update to 6.0.0.pre9