Refactored WCF