Added HTML parsing for custom markup