Add grid muxing support