Slightly updated class diagram