Refactored lookup