Add callback to #lookup() method so we can eventually moved to an async model without breaking API
Fix documentation generator and make documentation a tid bit better