Changes for OM support