New updated Classdiagram