Fixed the dependencies and the DI file.