Changed namespace
Refactored to inject just needed dependencies instead of whole container