Update for recent omni changes