Added abstract entity class