Added Query Parts for Query Generation