Finalize class diagram draft