Right, columns should be tokenized properly