New functionality

So to support partitioning