Initial adaptation for Omni

Signed-off-by: rebelos <ks50497@gmail.com>