Add wrapper for missing tools