Add resolve code