Added more features to volume partitioner and shapes.