Update resolver path
Use common.sh