update resolver to work with proxies instead of pointers