Major changes to the cdmlib default term loading and initialization, plus indexing of some model entities as part of #476