Updated classes for T1
Updated classes for T31