Added New Stuff for Classes