Next attempt to deal with columnarization in a less copy-paste way