Adapt to the WCF standard

see http://goo.gl/dV0wtI