Update to plugin/history architecture