Removed unusable dependency
Add new implementation class and use Qualifiers for injection