Make API more consistent about (sub)clusters