Added the resolve method