Switched to dynamic-table component