* Massive update in framework
* Cleaning