Added some model associations