Added ability for dynamic table type