Check in latest code for entity conversion