Dagger support added.