Refactored project, major changes in dao layer