Added experimental diagnostics module