Refactor enum tiers
Thanks to Haim code works again
Still trying to get the OneToMany working properly