Minor updates to the structure