Rewrite to fit new WCF schema