improved lookup api - issue #6