Replaced association methods
Replaced hand-written association methods with shortcuts