made more WCF compatible