Added HTML only support