Update from columnizer_base