Updated Queries to new model