Restruct. Old dumps removing #2 implemented