Little work on EntityBase