Added partitioning check