Small DAO inclusion refactoring. TODO: test it.