Add Omni support