improve ws/model/design