I agree. I'll make the changes to use the DI