modify resolver implementation