Fixing entities and DAOs