Feature/legacy import