Updated resolver v2.0.11