Updated partitioning methods