refactor model dependencies