Update class diagram

UMLLab got dangerous here: Please revert these and the following property changes as these property removals will break stuff.