Added Lookup API (WIP - not part of the build yet)