Continue refactor dependency injections