Missed classes from recent refactoring to make oter apps compile.