More work on WPS support