Moving properties and methods to the abstract Entity base class