Updated DAOService
Updated DAO + various