Consolidate operators with better data strcuture