WSOTWO-126: Prototype of improving element classes