Started addeding Dagger support