WS-004

New Designimplementation