Changed DAOs a little
refactor
refactoring some more