Editing: EntityResolver.php