Improved model queries
Some comments