Started to refactor using association methods