More entity conversion