Updated with a name to col number resolution via the catalog