Refactor presence probe handling