Added diagnostic_updater support