Renamed Hydrator class to Query