Added partitioning