DAO & Service fix