Convert all to simpler tables