Added support for lines-style columns (from 1.7 branch)