Added XML files and modified importer hooks