Added additional tables for data points