A Hardware Manager WPS Class improvement.