Added base Entity class