Reworked uniTable functionality