Integrate lists into the grammar