I like that approach. What would you think of merging this pull request and refactoring to incorporate the new version of lookup-in-resource as a separate branch/issue/pull request so as to compartmentalize the commits a bit?