Fixup of model/graphnode add/removal
Added in specific obstacle/key exemplar references