Make persistent-config more modular