Added exception and wrapper support