Added better querying to Jack