Adding more flexibility for table kwargs