Rework resolver library.