Add BNR support, start using dagger