Added now playing support