Add better control over the resolution process