Changes: Collection instead of list and mappedBy for OneToMany relation