Added more dagger implementation