Reworked Dagger usage
Improved imports