Dependency injection + modifications