* Fixed for new dao library