Improved method for storing alternate column names
Merge branch 'fix_flowdata'
Fixed bug in alternate column name handeling