added Omni Support