Changes for Omni bringup