Fixed: Added class missed in latest refactoring.