All DAO's and services converted in singletons