Further work on XBMC import