Switched daos over to singletons since they now contain state