Added support for Wpa81 and Wp80