Improve resolver