Add WPI-66 functionality