Diagnostics Extensions