Some updating in dao and service layers