Add WeatherQuery and AmbientQuery subclasses