Improve automated handlidling of partitions