Updated with latest changes on Omni