Added additional tags for ?Construct class for WS245