WS Refactor, Rest service complete