Added has_many and belongs_to