Refactor container descriptors
Refactor (and template-ize) the various descriptors