Updated guide modules to re-use the core persistence better.