Import directories are handled much better now