Added lookup helper to all invocations. Crude but a place to start.