Added unity in WCF and some MAJOR refactor