Work on service and dao