Improve resolve delegation