Added some character entities for mapping.