Added HTML support