UPDATE: Change width and add class diagram