Refactors for association proxy