Adds Viper integration (untested)