Modified DAOs (Small refactoring)
Resolves enhancement-#3
Merge branch 'enhancement-#3' into web