Make getOMClass calls consistent