improved model associations