Created generic lookup wrapper

also made existing wrappers use new generic function