Updated Classes and more