Add the playlist retriever
Improve code