(Completed) Refactoring: Changing the way the Resolve methods are used