Added has_many functionality