Added MakeClass