Replaced call injections with constructor argument injection