Modularized Services and DAOs
Edited with the new Services and DAOs