Add more classes to support refactoring.