adding character entity reference support