Improved model associations