Revamped Grammar Tables