Added guid lookups, replaced SiString lookups with shim