Improved model methods