More playlist refactoring