WIP: Refactoring associations