Only optionally support Heist