Using new entity structure.