Modified DAOs (Small refactoring)
Resolves enhancement-#3