Refactoring to inject new components