Turn Locations into dicts less often