migrate to new resolver