Update for WCF 2