Minor updates to structure