Added support for html table based features