- Better diagnostics