Added support for columns and lines in Tokens