More wcf changes