Several Changes to DAO model, preparations for MT