Additional changes to structure.