Added the That class