Updated for csvtodb