Updated class-diagram