Track column count explicitly