Add largestSubpart etc