Added the code for the name resolver