PCT-670: Add support for partitions