Refactored the entity classes that inherit the Base entity class.