Updated with new queries.