Add some structure changes