Changed class diagram to reflect on recent architecture changes