Update some structure for further work