Changes to SSD and Class diagram