Updated DAOs for fixing some cases