Ws inheritance and fixes