CHANGE: Dependency Injection in dao package