Rework the WeatherData objects