General improvements
ComplexResolver semi-functional checkpoint