Added some structure changes.