Better composite handling.
Initial attempt at assembly-hub support.