Just a thought.. playlist-data-source naming is an odd man out among handler. any reason why we should not maintain the name *hander?