Updated the structure