Fix Import, export, return controller