Improved model queries