Implement the new custom Injection API
Implement Doughwan recommendation