Refactor: Keep Query internal to the db module as it may go away or change a lot