Improve playlist related function