[#41013611] work on Ameni's code integration in the project, add the serialization