Classes diagram - Updated