Added base class for entities