Refactoring RTC-USER-WEBSERVICE part 3