Class updates

Various Classes have been added