Added tables to house the data attributes