Tables Revamped data structure #87