More entity wrapping