New classes to support refactoring effort to improve clarity of naming
structure.