Moved lookup code to client folder