Added the rest of the properties and types to the class diagram