Added support for omni builds..