Update to externalize storage and configuration.