improve model associations