Added persistent data, among other things...