RESTWS-267: Refactored