new/modified Services and DAOs
Merge origin/master