Migrating to use dagger code