#396 - Address map structure persistence issues