Added new classes in preparation for refactoring