Start refactor of all daos