added all WS implementation