Simplification of Framework and remove Configuration its become useless, add of unit test for Framework
Change Code Style
Resolve conflict