Removed InheritanceType annotation on AbstractEntity & adapted other Inheritance-related annotations