Model2 and Query updates