Added base class for entity