Added EntityBase