Restructure CSITs for info and timeouts