DAO changes for tornado