Updated to work with Kodi requirements