refactoring add Classes.