Updated Query Model