[s4-110] Fixing Tools to optionally support Helix