Major change to support table partitioning