Added support for dictionary to table