Changed to more 'railsy' associations