Some minor changes
WCF added