Add support for tables

Add support for tables, organize demo arrays