Improve intern package resolution process