Updated dao and service