WSOTWO-114: removed duplicate code in diagram elements and element properties