Update definitions and add more datapoints