Adding playlist support