Added columns to be compatible with new source data structure
minor changes
Merge branch 'Local-development'