- Add resolve() and lookup() methods