Added integration with diagnostics