Change associations to type has_many :through