Fixed NumberFormatEception, updated class diagram.