Refactoring + hand-made associations