Additional work on SQL import/export