Modify structure more