Adding code to pass basic lookup tests.