New updates after WPS improvements