Added XML character entity support