Updated Classes

More updates