Added back the class