Added model associations