EntityBase added