Adding FaultException support