Added support for arbitrary HTML attributes in a tag