Improved partition default container type selection
Better name for partitions variable