Class diagram updated

Updated with the changes Fran requested.