Fix has_many and belongs_to