Made some changes to conform with the final WCF 2.0