Updates for legacy import