Add Omni Support