Changes require for new resolver service.
Changes require for new resolver service.