Moved to a ManyToMany relationship for future proofing