Replace direct instanciation with injection