Added htm and html support