Added unit text for entity encoding