Added HTML view support