Import messages framework + fix save sections