Added option for allowing trailing commas