SPLEVO-401 Refactoring Resolving: Improve Resolve Strategy