Updated resolver v2.0.9