Finish work on the resolver