Transformed more constructor instantiations to using DI