Add new queries and modify behavior