Added columns to be compatible with new source data structure