Adds catalog importer implementation and fixes some bugs