Refactor model associations