Added Query Conditions