Mail class added