Add omni specific changes