v 1.2.0
Improve dependency injection