Improved modules to efficiently use dependency injection.