Updated diameter classes