modify resolver implementaion