Adding an import report and improving the link rewriting