corrections of DAO & Service