- Added missed classes for the previous refactoring