Update structures better