[FIX] Re: Refactoring Associations