Updating to fix structures