Adding validation for Query, Partition and Definition additions