Reverted Entity back to an abstract class