Added endpoint diagnostics