Reworked the entities, Now they use OneToMany relationships!