Major changes for exception and c++eff