Towards 0.7 version, lot of code to be cleaned
Towards 0.7 version, lot of code to clean