Beginning of code adaptation to the new construction