added resolver