Add I class special cases