More changes to structure