Improved resolver framework