Added export-path and init-links