Refactor Probe configuration