More entity reformatting