CORE-4032: added some new entity fields