Lookup code has been ported to the new API