Bugfix for missing use of new entity classes.