Dao - fixed all of client feedbacks