Simplify creating oi for wavefront