changes to service and dao