Add persistent store, rework generators a bit