CON-1944 | WAMService code improvement