+ Terminal class refactoring