Add more diagnostics/service controls