Added support for HTML entities