City and weather objects replacing dictionaries