Add ability to disable structure saving