Added rudimentary query model