Refactor associations model, separate concerns