Import from DB TODO fix