changes in the dao provider and dao layers
still needs testing