Updated the structure of the solution