Improved model computation