Add mode-s tools