added some functionality on DAO and service layer