Modify structure slightly