Updated the structure again