Performance fixes to reverse mapping and pruning as well as revised interface for references (now attributes on the objects as their instantiated)