Introduction of Curcao 2.0-M10 and associated refactoring