Small entity class refactoring, move some common logic to base class.