Feature/wps authorization 337