Add CTE column list support #486