[Refactoring] Added the other classes.