Adding more columns to pivot