Changes in import, nav, catalog