Added HTML class support