Added "Dao" refactoring