Added the start of query for new changes support