Replaced all association methods with shortcuts