Added resolver framework