Adding New Classes and Renaming