Use association instead of finding by id