Getting ready to support persistant changes.