Add improved resolver framework