Improving Partition API