Finished refactoring associations