NF: Custom Partitioner added