Updated map keys to use new column names