Refactoring of resolving data