Added T2 processing support