First step in decoupling clients from Lookup