Moved to separate method for handling resolution logic