Changes with updates to entity unwrapping.