Add some comments for the WS implementation