Further work on xbmc importer