Adds work on playlist support