Fixed up the DI issues. Added more dependencies