Updated and improved uml class diagram