@dschenkelman Why the export factory here? I think it's fine to just pass the engine wrapper in as it can be reused across sessions.