Refactored probe design