Update to services and dao

Update to services and dao streamling