Input Adapter Refactoring
Extended Modularity