Added more Dagger wiring for the future