Still updating the way queries are constructed