Modify C#-Classes
Bugfix