Added support for TableStorage