Add lookup functionality and test coverage for it