Reduce complexity of import_stage