Class based redesign