More refactoring using association methods