Homebrew DI replaced with scaldi