Added HTML parsing