Fixed Class Diagram @iElmar @sander3991 @HenkertJan