Added resolver