Refactored probe storage, added api
Merge remote-tracking branch 'origin/master'