Additional changes to structure