Add Viper & Mako COT Support.