Update to use LocalLookUp