moving stuff from templated Entity to EntityBase