Refactored USER domain to make space for playlists