* Updated Classes Management