First-class kitting support

First-class kitting support