Refactored association attribute/field includes the right way