Update to match entities removal